Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:57:36 +0000 (18:57 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:57:36 +0000 (18:57 -0500)

Trivial merge